Added fix to angular and links issue *sigh*
Moved to different query to fix bugs