Updates to search and controllers