add temp hint for user, fix content sql
merge conflicts...