use -setup for keystone searches

rebase
resolves TA247