cleaning up some old views and controllers, fixing some search criterias