fixes #4708 - Prefix ambiguous id in query
Merge pull request #3842 from daviddavis/temp/20140319150922

fixes #4708 - Prefix ambiguous id in query