Better controller override method, reinstate original search routes