fixes for #575 - non-component custom tags

#575