Changed implementation of newDashboardSelect and newEnpointSelect queries, from older hard coded queries to new CPK Endpoints buttons on CDE

Implementing one single filter for both (WIP)