Visibility, remove stored query functionality and small fixlet