Add ArraySource sorting, add filters to spoiler