Completed basic functionality for searches