Added match option as filter