More work on instance search screen