contextual selector fixes
Merge branch 'master' of github.com:guybedford/amdquery