Fix search fields, list display fields for Photo and Album
Fix merge conflicts