Add link to sub page
Do more querying