Refactors for later action link filter