Fixed shortname filter.
Started work on a query interface.