add search criteria and move simple criteria to namespace