[services] - rewrote search queries, cstarted cleanup