added more functional search