A number of small fixes after reviewing full import
Allow a filter to be applied to the compiled export