#1254 - fix search controller issues