move else case where we can find it
move lookup table out of function to make fn shorter
manual merge
Merge commit '4cfd' into culttag-redux