Fix problem with include options in query.
Reorganize module options a bit.
Alphabetize ini file.