fix errors and remove unneeded code added in prior commits (1b1586b, fbaed0f)
override `rank` getter in order to remove random instances of `rank.to_sym`
fix typos in commit 1b1586b (fix instances of `:content =>` in top-level queries)