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