fix typo
add more blockers
another n+1 query
protect page parameter, must be numeric to stop probe warnings