GUI - improved search
GUI - improved search