Add LIMIT 1 to findOne query.
Only do checks in fluid mode.
Refactored tagging.