Improve listing in annotation dir to only pick up subdirs.