alt tags and db fixes
merged dev to master
merged