#24 Fixed data queries according to status filter.