Improved photo queries