Added filtering and ordering.