Changed score call to use query and link
Edited location regex