Reworked the entity selector of the new analytics page

This is an internal release in the ongoing analytics project