Added final step to searching entities. Relates to #4