Add better filtering and parameter injection to router