Fixed @Matches annotation handling
Fixed @Parameter to support query parameters again