Search controller fix