improved search criteria handling in UI