Improve Cannot Shop query; view tweaks