Issue 44: Fix expressions to work on just requests where relevant