Use SMW queries for @requests
cleaned up