Cleanup and made ExtensionFilter case insenstive