Fixes WSOD on annotation permalink
Merge branch 'fix_annotation_permalink' into dev