Fix for missed parameter.
Fix for finding full tags.
Clean up.