fixed includes and cleaned up the count photos, add album, and add
photo queries