Fine-tune search function, add back button