Improved show search system (working towards bringing it inline)