VID-1308 cleaning up some selectors and adding more logging