Add support for 'count ..' and 'find .. track X'

Split these out of my albumartist branch - support for "find ... track X" and "count ...."