[DB] put in AND album/artist/genre when needed