Removed all short tags from Atabase