Tidied up the sub page query.
Added missing page parameter.
Tidying up the refactor!