Made calls to search entities a little more readable