NEW DB, random sorting options fixed