Fixes for category filed and incorrect short code handling in full text field