Draft jobs query condition fix and showing back other status in results