Distinct queries

Fixed up / make the queries more distinct. The commands are a bit
convoluted though (enter track + <album_name> to get the tracks on that
album?).