Added policy to prevent double results.
Clean up code + send question ID too
Removed unused code -> replaced by policy